Auto merge of #1143 - alexcrichton:issue-1138, r=huonw
authorbors <bors@rust-lang.org>
Fri, 9 Jan 2015 23:38:12 +0000 (23:38 +0000)
committerbors <bors@rust-lang.org>
Fri, 9 Jan 2015 23:38:12 +0000 (23:38 +0000)
commitc2c6f407441bff66224cc940e84eef2cc14a99bc
treedffc708010e2bfc5493f7f3bce2b8a49de899303
parentc9442a7b5f57e1e6607b62a9a58fe750fdc28713
parentb2e658c2e31cb5975eabe6806844dee02ce28305
Auto merge of #1143 - alexcrichton:issue-1138, r=huonw

Same fix as #923.

Closes #1138